From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 11 Dec 2020 13:30:05 +0000 (+0100)
Subject: ci: Improve checkout script output
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~616^2^2~686
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=3cf35ce6dfc40fd1fdf644354bfc59e8e43e24d7;p=gnome-shell.git

ci: Improve checkout script output

We are currently not very good at communicating what's going in,
in particular for non-merge request pipelines where the output
is usually just "Using origin/master instead" (instead of what?).

Improve this by consistently communicate what we are looking for,
whether we found it, and what we end up doing.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1529>
---

diff --git a/.gitlab-ci/checkout-mutter.sh b/.gitlab-ci/checkout-mutter.sh
index 9a32b6bbf..0304fe29a 100755
--- a/.gitlab-ci/checkout-mutter.sh
+++ b/.gitlab-ci/checkout-mutter.sh
@@ -2,10 +2,11 @@
 
 mutter_target=
 
-git clone https://gitlab.gnome.org/GNOME/mutter.git
-
-if [ $? -ne 0 ]; then
-  echo Checkout failed
+echo -n Cloning into mutter ...
+if git clone --quiet https://gitlab.gnome.org/GNOME/mutter.git; then
+  echo \ done
+else
+  echo \ failed
   exit 1
 fi
 
@@ -15,19 +16,27 @@ if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
   merge_request_remote=${CI_MERGE_REQUEST_SOURCE_PROJECT_URL//gnome-shell/mutter}
   merge_request_branch=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
 
-  echo Looking for $merge_request_branch on remote ...
+  echo -n Looking for $merge_request_branch on remote ...
   if git fetch -q $merge_request_remote $merge_request_branch 2>/dev/null; then
+    echo \ found
     mutter_target=FETCH_HEAD
   else
+    echo \ not found
     mutter_target=origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
     echo Using $mutter_target instead
   fi
 fi
 
 if [ -z "$mutter_target" ]; then
+  echo -n Looking for $CI_COMMIT_REF on remote ...
   mutter_target=$(git branch -r -l origin/$CI_COMMIT_REF_NAME)
-  mutter_target=${mutter_target:-origin/master}
-  echo Using $mutter_target instead
+  if [ "$mutter_target" ]; then
+    echo \ found
+  else
+    echo \ not found
+    mutter_target=${mutter_target:-origin/master}
+    echo Using $mutter_target instead
+  fi
 fi
 
 git checkout -q $mutter_target